merge trunk
authorK. Handa <handa@gnu.org>
Fri, 11 Oct 2013 14:50:25 +0000 (23:50 +0900)
committerK. Handa <handa@gnu.org>
Fri, 11 Oct 2013 14:50:25 +0000 (23:50 +0900)
commit558dbbaac039cd6460e753e30f3d23a1401b93b1
tree82e2a1efb31ac8d68c29c24b280eaa92e573a38d
parent0733c155e609dc3d7540d107f8bc3e7649676917
parentae811143d62fc420b1484533fd80066d59d72ce2
merge trunk